From 181cacbfea03dc41f3c45b6e0ef60a261d52b9ad Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 30 Aug 2001 16:32:34 +0000 Subject: [PATCH] apply fix to #58420 from Hidetoshi Tajima and Matthias Clasen 2001-08-30 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_check_cursor_blink): apply fix to #58420 from Hidetoshi Tajima and Matthias Clasen --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ docs/reference/gtk/tmpl/gtk-unused.sgml | 16 ---------------- docs/reference/gtk/tmpl/gtkmenu.sgml | 6 +++--- docs/reference/gtk/tmpl/gtkwindow.sgml | 20 ++++++++++++++++++++ gtk/gtktextview.c | 6 ------ 11 files changed, 58 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 425b1d3c37..e163aab2eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-08-30 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_check_cursor_blink): apply fix + to #58420 from Hidetoshi Tajima and Matthias Clasen + Wed Aug 29 17:28:04 2001 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 425b1d3c37..e163aab2eb 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-08-30 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_check_cursor_blink): apply fix + to #58420 from Hidetoshi Tajima and Matthias Clasen + Wed Aug 29 17:28:04 2001 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 425b1d3c37..e163aab2eb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-08-30 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_check_cursor_blink): apply fix + to #58420 from Hidetoshi Tajima and Matthias Clasen + Wed Aug 29 17:28:04 2001 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 425b1d3c37..e163aab2eb 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-08-30 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_check_cursor_blink): apply fix + to #58420 from Hidetoshi Tajima and Matthias Clasen + Wed Aug 29 17:28:04 2001 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 425b1d3c37..e163aab2eb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-08-30 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_check_cursor_blink): apply fix + to #58420 from Hidetoshi Tajima and Matthias Clasen + Wed Aug 29 17:28:04 2001 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 425b1d3c37..e163aab2eb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-08-30 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_check_cursor_blink): apply fix + to #58420 from Hidetoshi Tajima and Matthias Clasen + Wed Aug 29 17:28:04 2001 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 425b1d3c37..e163aab2eb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-08-30 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_check_cursor_blink): apply fix + to #58420 from Hidetoshi Tajima and Matthias Clasen + Wed Aug 29 17:28:04 2001 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index ac2f00a2ef..486ca82f80 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -2345,14 +2345,6 @@ fundamental type. @window: @Returns: - - - - - -@window: -@Returns: - @@ -2369,11 +2361,3 @@ fundamental type. @window: @functions: - - - - - -@window: -@resizeable: - diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml index 9d4e531e7a..29e75e743a 100644 --- a/docs/reference/gtk/tmpl/gtkmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkmenu.sgml @@ -96,9 +96,9 @@ Creates a new #GtkMenu. Adds a new #GtkMenuItem to the end of the menu's item list. + @menu: a #GtkMenu. @child: The #GtkMenuItem to add. - @m: @c: @@ -108,8 +108,8 @@ Adds a new #GtkMenuItem to the end of the menu's item list. Adds a new #GtkMenuItem to the beginning of the menu's item list. -@menu_child: +@menu_child: @m: @c: @menu: a #GtkMenu. @@ -122,10 +122,10 @@ Adds a new #GtkMenuItem to the menu's item list at the position indicated by @position. + @menu: a #GtkMenu. @child: The #GtkMenuItem to add. @pos: - @position: The position in the item list where @child is added. Positions are numbered from 0 to n-1. diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml index b601a6e9bd..6e38db29a0 100644 --- a/docs/reference/gtk/tmpl/gtkwindow.sgml +++ b/docs/reference/gtk/tmpl/gtkwindow.sgml @@ -128,6 +128,26 @@ the child gets a larger allocation than it requests. it's larger + + + + + +@window: +@setting: + +@resizeable: + + + + + + + +@window: +@Returns: + + diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 9b413bbe91..71429dc3ae 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -3744,12 +3744,6 @@ gtk_text_view_check_cursor_blink (GtkTextView *text_view) return; #endif - if (text_view->layout == NULL) - return; - - if (!text_view->cursor_visible) - return; - if (text_view->layout != NULL && text_view->cursor_visible && GTK_WIDGET_HAS_FOCUS (text_view)) -- 2.30.2